From: Jonathan Yavner <jyavner@member.fsf.org>
Date: Fri, 30 Jan 2004 08:01:43 +0000 (+0000)
Subject: Changes suggested by Stefan Monnier to truncate decimal places if print format too... 
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~24318
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=2b01392d039a7b2922fec2f837985afeb669ea69;p=emacs.git

Changes suggested by Stefan Monnier to truncate decimal places if print format too large for column width.
---

diff --git a/lisp/ses.el b/lisp/ses.el
index b50a441d261..a56b1b5c87a 100644
--- a/lisp/ses.el
+++ b/lisp/ses.el
@@ -1,6 +1,6 @@
 ;;;; ses.el -- Simple Emacs Spreadsheet
 
-;; Copyright (C) 2002 Free Software Foundation, Inc.
+;; Copyright (C) 2002,03,04  Free Software Foundation, Inc.
 
 ;; Author: Jonathan Yavner <jyavner@member.fsf.org>
 ;; Maintainer: Jonathan Yavner <jyavner@member.fsf.org>
@@ -52,7 +52,7 @@
   :group 'ses
   :type '(cons (integer :tag "numrows") (integer :tag "numcols")))
 
-(defcustom ses-initial-column-width 14
+(defcustom ses-initial-column-width 7
   "Initial width of columns in a new spreadsheet."
   :group 'ses
   :type '(integer :match (lambda (widget value) (> value 0))))
@@ -720,11 +720,23 @@ preceding cell has spilled over."
 		;;Fill to complete width of all the fields spanned
 		(setq text (concat text (make-string (- maxwidth len) ? )))
 	      ;;Not enough room to end of line or next non-nil field.  Truncate
-	      ;;if string; otherwise fill with error indicator
+	      ;;if string or decimal; otherwise fill with error indicator
 	      (setq sig `(error "Too wide" ,text))
-	      (if (stringp value)
-		  (setq text (substring text 0 maxwidth))
-		(setq text (make-string maxwidth ?#))))))))
+	      (cond
+	       ((stringp value)
+		(setq text (substring text 0 maxwidth)))
+	       ((and (numberp value)
+		     (string-match "\\.[0-9]+" text)
+		     (>= 0 (setq width
+				 (- len maxwidth
+				    (- (match-end 0) (match-beginning 0))))))
+		;; Turn 6.6666666666e+49 into 6.66e+49.  Rounding is too hard!
+		(setq text (concat (substring text
+					      0
+					      (- (match-beginning 0) width))
+				   (substring text (match-end 0)))))
+	       (t
+		(setq text (make-string maxwidth ?#)))))))))
       ;;Substitute question marks for tabs and newlines.  Newlines are
       ;;used as row-separators; tabs could confuse the reimport logic.
       (setq text (replace-regexp-in-string "[\t\n]" "?" text))